Update to Consortium Main Aug 17, 2022 #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove unused variables from -Wall compile. * Remove all trailing blanks * Add argcheck parameter (never, first, always), not yet used * Rename options with capital letter to all lower case Mixed case causes some funny issues with alphabetical sorts
* set qos=debug, which should be okay for _small_ jobs * Thanks to @mathomp4 for providing this macros file * Set ICE_MACHINE_ACCT to g0613, this _should_ work for most NASA Global Modeling and Assimilation Office (GMAO) folks. For non-GMAO/outside of g0613 group, please use your gid.
eclare108213
approved these changes
Aug 17, 2022
|
@apcraig Did we decide to use squash-merge or plain, for this repo/branch? |
|
Don't squash merge this one. PRs from Consortium main should be "regular merged" for now. PRs that are new code could be regular or squash merged. Ultimately, we'll merge development back to Consortium as a squash merge, so we're really just trying to maintain this branch as much like the Consortium main as possible for now. History will change on the Consortium main later. Thanks! |
eclare108213
merged commit 4ff4e28
into
E3SM-Project:cice-consortium/E3SM-icepack-initial-integration
eclare108213
added a commit
that referenced
this pull request
Sep 30, 2022
Update snow table implementation and add SNICAR SSP Tables
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes argcheck and code cleanup as well as nccs discover port.